Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Mon, 19 Apr 2010 00:32:54 +0000 (00:32 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Mon, 19 Apr 2010 00:32:54 +0000 (00:32 +0000)

Trivial merge